fixes to a dart analysis regression
Merge pull request #3255 from devoncarew/devoncarew_dark_analysis_fixes

fixes to a dart analysis regression