Move default return to end of function for Go 1.0 compat