Misc. cleanups, including static block ids.