Clean up some syntactic noise