Use the helper instead of code duplication.

Refs #101