A couple of bug fixes

@HowardHinnant @nbougalis 
We already use indenting parameters to indicate subparameters, so this is different from 98% of our code and hard to read to boot, but whatever.

+1