Match upstream constant values.
Removed some commented out dead code.
Whitespace cleanup.
Merge remote-tracking branch 'origin/master'