am 468532ea: Entry point clean up.

* commit '468532ea115657709bc32ee498e701a4c71762d4':
  Entry point clean up.