Not sure that's worth special-casing
Formatting tweaks