push explicit cast to minimal expression

Change-Id: I33879aa7724703745728128e59735e5d16aa2a57