shlib.sh/update.sh: refactor some banged code