IN-244 make the expression usage simpler, drop all of the assumptions and delegate them to users