Previous GCC7 fix was incorrect and GCC8 correctly complains about it. Fix it properly. Also cleaned up the Makefile for consistency between packages. Signed-off-by: Rosen Penev <rosenp@gmail.com>