Merge "Minor refactorings in api.go"