More work on new content parsing system.