Add codegen for short and int expressions