Merge from Annex60:issue95-2_nominal

This change primarily avoids warnings about alias sets with different
nominal values in OpenModelica.
It also contains some reformulations that are needed for OpenModelica.