Redo s-expressions to be nicer