Even more dependency ironing and crap domain filtering.