Some syntactic style cleanup.