Allow mixed octave marks, and extend moonlight a few bars.