Split inline from block parser class, and other small refactors

Split inline from block parser class, and other small refactors #3498