Small simplifications
Clean up signatures of duplicate checking functions