Allow multiplication in volume; various related refactoring.