Reduced the preserved files in keep_vba mode and fixed bugs.

Created originally on Bitbucket by jbovey (John Bovey)

Was already merged in Bitbucket before import, marked as merged by the import user