Part 22: Improved method generator restrictions

Should be the last one. Goal is to merge into master asap