[Refactoring] Remove use of Expression::addressOf in glue layer