Tidy up - remove redundant specification of type arguments