i965: minor clean-ups