am 05cebdc2: Merge "Fix several bad function definitions."

* commit '05cebdc2abd05b0dca351306cb039245d50c67ae':
  Fix several bad function definitions.