A version that's truly robust.
Merged.