Straighten out portability story somewhat