make some of the generated lustre more concise