Make parsers overrideable from outside
Roll back legacy indent