am 233f32ec: (-s ours) am 468532ea: Entry point clean up.

* commit '233f32ec80ad3e45d6efce993d1108cf8d1b7784':
  Entry point clean up.