Minor clean up of fcpLib.