Add 'variables'.
Fix parsing of nested tuples.