WP-3269-1: remove some unneeded extends, small fixes.