Simplifying partial functionality a hair.