Streamlining the calling chain a bit.