Remove redundant check with numberp using equalp

This also compares number types more sanely.