Code clean-up: Remove unnecessary interpolation

There are a few places where `"#{expression}"` could be simplified to just `expression`.