Playing nice with non-sentinel setups.