Merge branches 'predef-fix', 'predef-helper' and 'simplify-add-pre-buffer'

* predefine: fix multi-token predefine
* predefine: add helper predefine_{strong,weak}()
* predefine: avoid add_pre_buffer() for targets
* predefine: simplify add_pre_buffer()