Avoid using giter8 formatters; move work on gener8bundle