Touchups

Update dependencies.  Minor code shuffle and removal.