#106: Cleaning things up via BENLINT