More work on xlocalize