Minor cleanup
Generalize expression dereferencing
Integrate combined scalar as dereferencable