Some cleanup to masonry setup.