Minor cleanups: Synchronise on the object itself, remove some extraneous semicolons, simplify an expression, correct indentation.
Merge in default