Adjust function syntax to the one described in xp-framework/rfc#286