I understand if we want to add additional functionality later, but I think we can pretty easily deal with more expression parsing.  I think there are some required changes below that are related.