Tweak property parser, and begin using it