Replace delimited

This branch changes the s-expressions to use names that are better at describing the node that "delimited".