More cleanup.
Fixed field visibilities.
Even more cleanup.