Minor edits to make new var pattern implementation via transparent wrapper also compiler under GCC