Fix failure to fall through to default handling when short circuit is not appropriate.