Minor speed improvements in constrain()
Merge branch 'sybil' of https://github.com/euba/BacArena into sybil