(Issue 3551) Minor code cleanup