I pushed a small refactoring, you can now use the `with_label` helper: https://github.com/rails/rails/commit/3007c297d35c4742b9267b31adb5ff7a19e9cda6