Fix {{afc comment}} when possible for #20