Portability and explicitness

"Explicivity" is not a word.
Merge pull request #1609 from nchammas/patch-1

Portability and explicitness