Partial DRY refactor.