Added instrumentation to capture types of subexpressions.  Not actually capturing that information yet, though.