[ET Trac] #2301: clean up code in GetComponents