Further progress for entity support, #1517.