Remove a whole bunch of () handling code that's no longer necessary