ContextRework: FIXING PROBLEMS WITH CinderDelegateBase, ETC.