Merge "Mechanical clean-up: semicolons, default access"