Slightly refactor FileHandler and subclasses