Rather than handling 2 different forms of input, why not change the callers to use a single way?