Minor streamlining.