Refactoring commit 2ada0f636457d7d4840e1691e31a0416d93f75cc.
Changed the inner marker variable name to be more generic.