Simplify GetCtor logic
Merge pull request #6542 from jacobdufault/minor-code-cleanup

Simplify GetCtor logic