Clean up some syntax.