Been said before my problem is with definition of "Confined". I dive at an Aquarium. Dry suit, 25lbs of lead, full face AGA mask, 80cf tank, with air and communication lines from surface. Exhibit has a surge engine which bounces you up and down a good 2ft or more. Buoyancy must be close to perfect as you don't want to be coming in contact with any part of the exhibit while the biologist are watching you like hawks.
Tasks include doing a show for crowd, so talking, digging around in a bag for food items, feeding individual creatures all while hovering. Throw in vacuuming the bottom, cleaning glass, doing underwater power washing, drilling, etc... etc... etc...
I think these easily require much better buoyancy, dive skills, awareness of surroundings than the vast majority of my tropical open water dives.
A pool is confined water. No matter how big the "tub" is. Unless it's big enough that you can't see the other side and mother nature is in control of diving conditions, then it's a swimming pool.
R..