This change breaks existing code, hence the version bump, but it's going to be much less error prone going forward.