Minor changes to some API signatures.