defword -> defprimitive, defcombo -> defword, dip, swap, drop
Expand test
Merge remote-tracking branch 'origin/master'