Stack maps: Refactor constructors.
am: 0d4567f267

Change-Id: Id320d64866c6777047da8c93400b312e0772017d