Fixes to pretty printing and parser validation.