Doesn't fix, but mostly addresses the concerns in #24. Some churn at version bumps is far better than what we have right now.