Fixed some nested defines with else/elif not working correctly Merge branch 'main' of rust-vs-extension