Add abstract method per a Scrutinizer suggestion
Fix up some type-hinting