The note scheme is in the protocol. The protocol is a living document.
Indeed they did make a mistake there. The proper way is to modularize it further.