#32 - Polymorphic expression cleanup.