Rework vxi11 module code