Part of #327: Refactor