Improved property parsing. Relates to #72.