ddcdd26ef6
where needed. Also, fix bad indentation on lines already affected by the above changes. Tested with: make universe