Fixing problem with extended association table expansions, optimizing association table expansion

Fixes #305