Add functions to get a single expr/constant.  Rename some functions.