- Changed some more code to delayed expansion.
- Some more cleaning up.