More formatting and consistency fixes

...same for those (but you might want to fix the whitespace between the cast and the constant - no clear guideline on that IIRC but it matches the other ones more closely)