Improve general-case performance.