Yeah - probably, with notes it doesn't matter so much right now as they're pretty semantically uninteresting. However we should probably be doing it _right_ anyway so we don't have a subtle bug later on.