Refactoring Block Parsers