Fix unintended bugs in aadl models (per bug report #3).