o.c.graphene.opiwidgets: cleanup and minor refactoring