Minor optimization; Minor simplifications.