Given that is a rather non-critical improvement, I'm not sure it's worth it spending time to figure whether we can use XAPI objects the way you suggest.