More testing.
Some changes upstream. Need to look into phantom values.
Removing a debug line.