Used namedtuples for bounds instead of dicts

Easier to read, really. I also got rid of the expressions for the
existing bounds.