Keep tabbing consistent for all constants.

Use the right constant name in a couple comments.

Count from 1 instead of 0 since we're not indexing into an array, makes
for cleaner code.