Minor simplifications / improvements.