8156802: Better constraint checking

Reviewed-by: dfuchs
9 files changed