Fix numerous Cypher type check issues