Fix a couple mistakes; move shape impls to source file.