More work on the various expression parsing functions