Refactoring BlockParsers