ClassScalarInliner: fix edge cases and internal refactoring
Merge remote-tracking branch 'core-parser/master'