Clean up docs, use better constant names and add a constant for NONE.