Add stuff for object shadowing (more to come) and clean up some declarations