Code: Replaces dynamic with actual data-types

As discussed at #1040.