Fix leak and multiply defined variable

Variable `prop` was leaking, and `property` was multiply defined and was being used outside of various scopes.  Also adding some missing semicolons to make my linter happy.