Use short-array syntax
More short-array syntax fixes
Mongofill compatibility for imagevariations