Totally true. #1 seems simple enough. I'll submit a PR