Workaround multi-term switching problem; minor cleanup