Special case for deferred start based on Handler type

Fixes gh-673