Fixed block types in Foundaiton. (#289)
Various cleanups in Foundation. (#289)