Saw that the handlers for each of these action types was identical, decided to merge them to reduce unnecessary repetition.

Depends on D4339

Close reading, will write some unit tests