annotation expansion now respects macrosDisabled