Fix const propagation issues to make GCC happy.

Submitted by:	Michael Butler <imb@protected-networks.net>