Few more code simplifications.