Minor cleansing after merge