XS-APItest-KeywordRPN being a separate module has turned out to be more hassle than it's worth. Attached patch merges it into XS-APItest. -zefram