[dq8] More minor touchups.