More work on the bullet wrapper.