Fixing class-hinted parameters checks (2)