Fixes for the model-free code for the return_interatom() changes.
Authored by: bugman 2012-06-25
Parent: [r17051]
Child: [r17053]