[mvrbm] some cleanup, compiles with gcc 4.8.2