Merge into master from pull request #342:
loci: begin removing inheritance unions (https://github.com/floodlight/loxigen/pull/342)