This patch has no function changes, except to ensure the git history correctly tracks the changes to convert the double version of these functions into a templated version.
