Adapted to latest spec, preparing TCK development.