Fix #2502: use simpler solution to assign statics and methods