This patch failed regtesting -- and on second thought I'm not too confident that the refactoring is strictly an improvement so I will try to fix the main issue (that is to make the test vrp-1.c fail to compile) in a more direct way.