Change `proxy-target?` to schema, other misc cleanup