Some knife cleanups. Expect more changes in the future.