Sounds good. I don't like the extra boolean flag either.