Prepare further subclass removal in favour of fluent API.