Tweaks to the original notice source parser.