Make additional changes from LOGBACK-268.