Mark constants when possible

No functional changes