Initial work on tuple descriptor match enforcement