Minor cleanup, refs-to-const refs