I think #defines are still appropriate. Since it's debug code, they can be placed right above the function (inside the #ifndef RELEASE) so they do not get used in release s/w.
Another way to handle making sure we get past s.t. dry state is to not set startNormalFill on res until op mode state machine gets to s.t. dry state. Then don't need to change this if to consider pre-tx state.