Started to isolate dependencies for zap-free (or zap version
independent) operation.