Add a vspace block to prevent tall arg blocks covering following blocks.
Other random fixes.
https://www.google-melange.com/gci/task/view/google/gci2014/5210967218585600
comment out broken remove code
Merge branch 'Scimonster-master'