I just pushed Markus Amsler's VAP_CNTL patch, which cleans up a lot of the
nastyness we previously had with this register. It shouldn't break anything,
but you know the drill, test and report. :-)
P.S. Sorry about the delay, real life got in the way...