Drop eqnull and eqeqeq