Change AddRoundKey to use packed rkey argument

Cadence NCSim doesn't like unpacked arrays in this context.
Miscellaneous code cleanup
Change function parameter ordering