Cleanup of variable naming and consts.

Agreed, this would be the best if a comment is required. In this case I decided to later remove this comment altogether, because this really adds no value. The API is bad if you need to explain that there is no default - that's the normal case ;)