Bit of additional cleanup for 2.5, #580