Adding some comments to velocityMarshaller and starting some minor
refactoring.