grault refactored.

Because DRY.