We have changed the naming of internal marshalling functions for args and result. So please use remove$args and remove$result instead of RemoveArgs and RemoveResult. 

Everything else looks good.