Just a small cleanup in preparation of 9.6, see attached.