I've personally switched to using a waterfall everywhere, even without asynchronous calls. Just to break down in small units that can crash easily.