Additional cleanup; restoring mouse-over highlighting.