Improved island code for long idents