I've no problems with the PR in concept, but I'd prefer if the constants were not changed. Then I can merge.