More short tags fixes.