Fix per-instance attributes and picking (for real).
Fix more tests.