New checks, remove duplication.