Tweaking furanator pattern.
Remove old CDK API usage.