Rework fallbacks a bit.