Minor clean-up + prefix support.