QVT2Alloy general cleanup
QVT2Alloy general cleanup