In-progress moderation work continues

Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>