Cleanups and improvements for FFAP and URL.