Progress on X6 bug fixing.

Still doesn't compile because I've introduced all kinds of headaches
with the move constructors. Might be better just to ensure that nothing
gets copied or moved... ever.

--BRJ