More note code path optimisation

(Oops, pushed to early with previous commit - that’ll teach me)