Eliminates redundant redefinitions

Now unnecessary because rexport bug is fixed.
Removes shadowing.

Necessary to get objectdraw to compile with the
new identifier resolution checks.