Minor improvements to constraints + attribute accessors.