I tried refactoring to that, but 1.9.2 and 1.9.3 didn't like it...