Should we do the same for shellscript.py? @redcat9