group object module: readability fixes, adding safeguards.