Don't warn on feed.stop if not activated

And some other trivial tidies...