Re-indent the control portion

I originally tried to have this within a scope block, but I guess
Chisel's naming falls apart when I do this...  I'll eventually end up
with this in another module, so I guess it doesn't matter all that
much...