Updated to the no-cast version.