Update to 6.0.0.Final

Mostly the same, though replaced commented deps with true optional
attribute.