Cleanup creators to properly handle static types

Issue information

From user: jurgenhaas

Contribution record

Fork management

Problem/Motivation

The return type needs to be static and the inline type hinting is obsolete.

Edited by drupalbot
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information