Code formatting and removal of residual parser toggle stuff.