Merge "Simplify IMMS constructor a bit" into main