Small refactor to greatwards: removing an unnecessary level of inheritance.