invoke-x86_64.m: Minor refactor

This makes it easier to add more complex types.