Hmm, OK.  The old code used $GET and $POST but had the same conditional blocks.  I'll try to work it back in that direction.