#606: #556: first batch of <fr> consistency work
opened by thuchacz