Magic number removal. No functional changes.
Merge branch 'master' of https://github.com/l1j/en