Merge in changes around setting up better syntax for distribution.