Pulled boundary values out of enumerations. Fixes #41