Fix up last commit, move to static logger.