Add a vspace block to prevent tall arg blocks covering following blocks.

And other random fixes.

https://www.google-melange.com/gci/task/view/google/gci2014/5210967218585600