Tweaks to REP-819 to try to make it a bit cleaner

Setting up the pull request so jenkins will build it for me, for now.