fix warning about constant redefinition.
move current spec to easy_spec to prepare for multi_spec.  fix issue with to_query spec.