33485: fixes for zstyle context handling
33486: new completion function