F2f tweaks

@twirl what do you think?

If you think this is good, we can then move it into the spec reviews repo.