Fixup notation scope