Fixed Analysis/Measurement Forms for Bug #35.