I suppose these TODOs are implementation notes for https://issues.jboss.org/browse/ISPN-2772? ;)