Fix EFAP code lint

Review of the EFAP code uncovered a few lint issues, which are resolved in the related MR.