more xwt -> ibex cleanup