Cleaned up the (new) headers for my FZ6!