Remove core.async dependency.
Minor name changes.