Some various code changes

More preparation for expression parsing and building.