... and another one.

More streamlining.