Summary: Remove the misleading malloc macro and cleanup the code
Reviewed-by: dsamersoff, kvn
Contributed-by: goetz.lindenmaier@sap.com