Remove comma, not used elsewhre
Remember type when paginating source review (closes #387)
Optimize rendering of checks

Inclusion means extra evaluation of context vars, let's avoid it by
template tag.