Some stuff I forgot to clean after modifing the Clip's autocollapse code.