FYI I grepped around and this function is never passed keyword arguments (plus it is private) so the name change is fine.