Add redundant return statement for Go 1.0 compat