Moving the frontier of macroeconomic modelling of research and innovation policy