Move default return to end of function for Go 1.0 compat

This specifically refers to this change: http://golang.org/doc/go1.1#return