EFA (analysis & report) code fixes and cleanup.