Update to use commandline wrapper script.