Move Shape#isEmpty() to right place.