Change to use xcscope and dictionary in elpa.