Use singleton arrays instead of atoms