Remove PORTABLE40 checks where possible