Fix use of deprecated files, improve block transformers to specify whether they want to generate before and/or after