I think you can patch the class to be more DRY