Finished up support for setup command/comment.