Fixing breakage due to move keywordification.