Do not double-pack subatoms
Save array terminator correctly