Rebase on master.
WIP: Makes usages output better.