Updated to account for pre-included CEDET.