[master] Re-factored ThunderVBSGenerator.cs.