EZP-22151: removed unnecessary inline type hinting and FQN