Improve pedantic logic.