Recognise more things as constant