Merged a broken parser because the wrong line in __init__ was commented out.