Move updating of defines into the Defines class.