Tweak access levels, remove extranous &r from logging.