Remove single-use constants now that we have our enum.