Some Speedups (Issue #205)