More adjustments for Tapestry 5.4 & RequireJS