Squashed 'floo/common/' changes from e415ce1..bc039ff

bc039ff Simpler reactor.block
7cdbfdc Merge commit '9e943d095f7cf404217cf90f9f5367716dd8849a'
e808f26 Merge common fixes.

git-subtree-dir: floo/common
git-subtree-split: bc039ff5e966d1e3896d89086bfe63ca512f91bf
Merge commit 'ccd1d1643e30f0ea15437382a38c68383e348f6c'