Move property collection into the main scope builder. Fixes issue 926.
R=johnlenz