Removed dependency on Paths_apia.hs
Cosmetic changes.