Modify some #defines

Long ago, I had replaced some #define expressions with the integers
those expressions would produce because I thought that might save a
little memory, but now I'm thinking it shouldn't make any difference, so
the expressions are back in place.