Have you tried filing the wafers flat against the barrel as Ian suggested? If the lock is well used (or poor quality wafers), the key (likely harder than the wafers) rubs down the inside surface, meaning the wafers will not pull into the barrel as far.
This, funnily enough, can also be the fix when your bike key starts behaving badly in the ignition!