minor code maintenance

git-tfs-id: [http://falcon:8080/tfs/Projects]$/Phalanger/Main;C4645
Merge remote-tracking branch 'refs/remotes/tfs/default'