OneShot and Toggle (OS/TG) do not work as expected.

[jpconstantineau]

Describe the bug
OS and TG macros for One Shot and Toggle do not work as expected

To Reproduce
Steps to reproduce the behavior:
Create simple 4x4 platform numpad keyboard with the following:
KEYMAP2ARRAY(KEYMAP(
KC_7, KC_8, KC_9, KC_KP_SLASH,
KC_4, KC_5, KC_6, KC_KP_ASTERISK,
KC_LSHIFT, OS(KC_LSHIFT), TG(KC_LSHIFT), KC_KP_MINUS,
LAYER_1, OS(LAYER_1), TG(LAYER_1), KC_KP_PLUS
));

Expected behavior
OS(KC_LSHIFT) sends LShift with the next keystroke; along with the next keystroke) - currently doesn't
TG(KC_LSHIFT) sends LShift with every keystroke until TG(KC_LSHIFT) is pressed again - currently only send shift

Same behavior happens with layers but even more confusing since pressing the layer key on its own does not send anything.

Additional context
found as part of creating the OS and TG tutorial