Tidy up a bit.
Whoops, I'm an idiot.
Remove spurious indirection.