...and now that I'm thinking about it, these methods really could use some unit tests. Let me see what I can cook up.