More coherent Jakefile