Merge "Use the public version of noteOp()."