Improving the RFC

Let's wait with merging this until we've agreed that the RFC matches the implementation.