Code cleanup for WinPhone.