Rewrite parametrized module to use tuple calls explictly