Various modifications to solve bugs and improve interaction with jdynalloy, especially wrt the use of java/alloy arithmetic.
conflic resolved