It was previously failing to null terminate the hostname string (was anyone actually using this?). Also move the macro expansion to the C shim.
