Refactoring that broke top height finding.