am ce6c1d61: Simplify variable typing for IA builds

* commit 'ce6c1d6184b76bbaee65d91dd715c771fd1a4652':
  Simplify variable typing for IA builds