DB-783 refactor Wno-vla code