Clean up dup and checkmate methods for readability.