Recognise more things as constant

This should improve run-time performance by recognizing more attributes as constant.