Style cleanup in parsing.