Some implementation details forgotten by @verpoorten and @bosman.