Some shape bug fixes to svg-move-viewBox.
Restructured a bit for clarity, also saving one byte. :-)