Remove an unused support check, correct a comment. Close gh-1211.