Ref #286, Cleans up code for adding granular scheduling on event add.