cleanup - standardize constants & clean up
cleanup - standardize constants & clean up

Switch to Go-standard constant names.

Straighten up a couple places where the code was messy for reasons I
can't remember.

Netflix/hal-9001