Add scope information for constructors/destructors