Reported by @anonymouspage, closes !211
Clean up  formatting in the touched functions while we're here.