Fix hook command expansion references to options