init_upcase(): Fix and cleanup