More explicit return statements for Go 1.0