Complete the port to Falcon 1.0.