Clearer separation between this spec and Matt's original proposal.