Minor editions to extensibility.