Simplify and cleanup bitv examples.