lint-inspired simplification