Clean up unused temp variables.
Clean up a few mathassert macros - unit tests check these cases instead.