Handle odd ?> token better