Updates for shopt and funcs.