Support for CF7

Replace non-CF7 compatible syntax with CF7 compatible syntax. Should be
functionally equivalent.