Some more work on DAO.stg. refs #437