[#2006] Tidy up.