Remove more code duplication.
More code duplication removal.
Oops.