Work-in-progress commit to slim down MADJ.