bxe: more cleanup.