Fixing build and tests (removing the collision-prone U macro).