Final tweaks to blocks.pyx and cleanup