Resolve remaining merge issues with the original Frank design.