Should we maybe already use the new "int" and "bool" short forms here?