this should fix the build on CURRENT - While here, minor style cleanups and dependency correction Reported by: eadler