(If there's an easier way to differentiate between cases like that I would love to hear it! That's part of the reason I posted here--throwing what I've got at the wall and seeing if anyone has something better.)