Generalize location information a bit

  Also, start marking modules Safe when it makes sense to do so.