ARMORY-125

Fixed a couple of merge derps and renamed a variable to make a
forthcoming code commit easier to understand.