Minor cleanup. noref