Pacify bots and simplify r220321