Suppress warning for certain orphan instances that we need.
Removed unnecesary shadowing.
Removed unnecessary shadowing.