Consistent cases.
Revert helper require, add test for #remove.