Minor code cleanup, bug 819:resolved