T.83.1: Fix non-Darwin build; fix WIDE build.