Assume all keywords unless specified.
Correct naming.
Clean-up MVC clipping.
Clean-up clipping in Pspec too.