Tiny refactors to remove long lines, delete empty aprs dicts