Fix {ok, ...} return values from before_