semantic: A few WIP additions to init generation.