uml: style fixes pass 2