Further sugar refactor.