Fold nacl-common into components