Minor cleanup.
Simplify supercell code.