cleanup: Substituted a few named constants for clarity.
bugfix: Fix copy/paste bug.