Minor change for readability.
Implemented the maximum constant abstraction.
Also fixed an old bug.