XRDML fixes

hardcoded access finally bit me. Also: cleanups.