Add ROLL and PICK, improve NIP.