Some further cleanup for chartable LBF forms.