I forgot to add: * 0001 looks an obvious improvement. You could just push it now, to avoid carrying it forward anymore. I would just put the constructName ahead of value expr in the argument list, though.
* 0002: I have no idea what this is (though I probably should). I would also push it right away -- if anything, so that we figure out sooner that it was actually needed in the first place. Or maybe you just need the right test cases? -- Álvaro Herrera 48°01'N 7°57'E — https://www.EnterpriseDB.com/