2.2.1: Simplify lookups and update lint formats.