Definition of Model.iter() now uses serialize.atoms function
Slight adjustment to behavior of apply_shape to prepare for upcoming changes