This one isn't actually used. Could we not make the constants change in this PR? I'd prefer to keep this PR targeted at the relevant feature.