Spent the last couple hours in class-dump. This shortcut implementation sure is taking longer than if I had just done things the right way.