Fix merge points to use the methods, which are the true constants, instead of the blocks wrapping them.

Signed-off-by: Stefan Marr <git@stefan-marr.de>