Don't need enumeration, remove some comments
Added create event hack to support nested shifts as a temporary fix.