* Merged in new trap code (twisti-branch).