@slawekjaranowski @olamy I think I have addressed all the comments, even I end up basically fixing the issue MCOMPILER-381 too.

There are a lot of other improvements that can be made, refactor legacy code, and more, but for now I don't want to keep touching and touching this (every time I look I end up making some small refactor), this should be a good improvement so far, as of performance concerns this should be at least equally performant than the previous code.