Remove more duplication in between expansion and translation