I'll hold off on any changes for this until https://github.com/sakaiproject/Hilary/issues/488 is implemented.