edge case cosmetics, and avoid some picky warnings