Replace all other function calls

No functional changes.