Seems like this is another one where not having 2 would be good.  Let's make sure we can't simplify things.