Removing completed TODOs
Fixing block-level 'label' in 'form'
Equivalent 'inline' fix for the tour