Bugfixes
#REMOVE: Removed recent performance improvements, because they made assumptions that aren't true in all cases.