Fix Convert Expression handling in some cases.