-Cleanup: replace a few more magic numbers with string enums