Code clean-up in PNaCl port