More cleanup of the whole apply / unapply situation.