Move return/bind to the top level