One more cleanup.

Refs #137