* Added the fix to 9306 to the other project types as well (SL and WP)
* Some formatting and commenting.