[style] fix indent
[Refactoring] Change return types from int to bool
[Refactoring] Remove side-effect in searchCtor
[Refactoring] Rename scope variable to `sc2` for aggregate members
Merge pull request #3513 from 9rnsr/refactor_ad

[Refactoring] Cleanup code around aggregates