[SPI-1455] Fix UniGen

Now UniGen should build. Please check it out.

This is not really 2.2 anymore, because I had to patch it beyond mere build-ability...