Simplify demo + bean output fields.