GSoC project to replace mk/wrapper with faster, more maintainable C code. No code yet. Tests first.