MBug: Minor code cleanup.