[PATCH] Add per-option help