Revisiting and Expanding the Laffer Curve