Further markup changes to achieve consistency.