More uses of require with istarget

I found a few more spots that check istarget that can be switched to
use 'require'.