Revert r312119 and reword the intent to fix -Wshadow issues
between exp(3) and exp var.

The approach taken previously was not ideal for multiple
functional and stylistic reasons.

Add to existing sed call in Makefile to replace exp with
exponent instead.

MFC after: 13 days
Requested by: bde