Moving some logic into waterfall() for style.