More of a style preference than a bugfix...