Add hack for command-line utils.