Split async entity fns into separate fns
Split async entity fns into separate fns

This is cleaner than weaving 2 different modes through the original fns.

democracyworks/scheduled-message-works,democracyworks/scheduled-message-works