Expand methods work with right references now.