Work on #6. Defused some flycheck warnings.