Refactored two core plugins into a more 'delta-like' style.