Fixed a hard-to-pin-down bus optimization bug.