Variant restructuring
Some of the variants/dependencies in the prototype were unneeded, I went through also with a keen eye on keeping the total number of variants a bit lower. I also added defaults that I consider useful.
Sits on top of !6 (merged)