Fix Shape.bounds to use new .rect()