A few more fixes to the 'return_molecule()' function.
Authored by: bugman 2007-11-04
Parent: [r3422]
Child: [r3424]