Support more strange 'uname -p' output. Fixes issue #773.