Merge pull request #118 from MichaelRFairhurst/void-fixes

Changes for landing https://github.com/dart-lang/sdk/issues/32161