Remove some empty helpers. Clean up some trailing whitespace.