svn r9: general code cleanup
2 files changed