I interpreted your suggestion as proposing to define different slides for shifted and non-shifted. On the other hand if you are just proposing to capitalize the expansion when we are in a shifted state, that is not complicated and worth considering. It keeps the 16 forms but only handles them differently in shift state.