A few more tweaks to better mesh with SIM backend.
Authored by: lmayes 2008-06-03
Parent: [r937]
Child: [r939]