Minor extensions on story parsing