ah, now that's lots cleaner.

plus, now have docs that reflect the real thing.