(Bug 5116) Some I missed on the first go-around.