Simplified rect2, it turns out Arthur's trick was not required.

Standard library now compiles fully.