Make checks DRY (as discussed in #12)