Make things DRY
0.9.2 (core 0.7.4)