Added optimization opportunity #25: improved type-based optimization