Tweak the code style

I think going the full way when indenting function calls is pretty much
the only way to be consistent. So that's what I'm doing here.