Convert "max" to "mx" for variable names (brought to my attention by Steve

Henson). Also, reverse a previous change that used an implicit function
pointer cast rather than an explicit data pointer cast in the STACK cleanup
code.