Fixed bug in /p where @p and other command-block usernames would not be expanded.