Tidy-up after realising I wasn't using the master branch of the xrdp source. D'oh!