Fix nasty fall through causing double callbacks.