Cleanup how ModelChildSelector forces classname selection