i was basically being extra paranoid to make sure to fall back to the existing behavior if anything unexpected came through, but i suppose that's probably all any of the code behind this cares about. will update.