Make feed branch pass `commonplace lint`

r? @ngokevin @cvan