Removes need for fixed buffer indices, and allows the functions
utilising them to also be run outside of context generation.
Signed-off-by: NBen Skeggs <bskeggs@redhat.com>