fix argument count check; fix return of *struct{} (...Ptr for *...)