Fill now implements IFill.  Stroke now implements IStroke.