Re #9900. Clean  up.