Fix rebase errors.

Prior commit wasn't RoyAwesome's...unsure how my rebase failed.

Signed-off-by: Chris Sanders <zidane@outlook.com>