Restore support for special targets.  Fix scroll parent optimization.