Adds sugar to please @ee0pdt.
Merges with upstream.