Remove unneeded type arg length check, more robust Tuple name Regex