Also, it seems like this function could be left at its old position in the file (simplifies diff, git blame output, etc.)