Revised fix for code gen for data constructor pattern matches