Removed some stuff from a bad merge; related to contexts. Added source context shortcut definitions