Tuples with prefix/suffix strings weren't always properly encoded with their shortcut notations. Fix this.