Make library more consistent with other Libraries

Use builtin keywords more.