Cleanup #5

Perform minor but global property declaration optimization. Also fix warnings for client tests.