Type Checking

[mrm9084]

Description

This fixes the last of the type checking, excluding is_enabled and get_variant as that might be a bigger change.

Contribution checklist:

• The pull request does not introduce [breaking changes]
• CHANGELOG is updated for new features, bug fixes or other significant changes.
• I have read the contribution guidelines.
• Pull request includes test coverage for the included changes.

General Guidelines and Best Practices

• Title of the pull request is clear and informative.
• There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR.