Minor cleanups to make pointer arithmetic clearer