- fix local var mismatch typo - allow unsetting of internal field classes
- fix local var mismatch typo
- allow unsetting of internal field classes


svn commit r4633

silverorange/swat,silverorange/swat